From 5d41103750236f39256edee9da1a864e2e00a496 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 23 Oct 2016 10:12:49 +0200
Subject: [PATCH] accessible: Drop deprecated connect_widget_destroyed

---
 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkaccessible.c                  | 34 ----------------------------
 gtk/gtkaccessible.h                  |  5 ----
 3 files changed, 40 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index fcd5ebdc6d..0066e72866 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -159,7 +159,6 @@ gtk_accel_label_get_type
 <FILE>gtkaccessible</FILE>
 <TITLE>GtkAccessible</TITLE>
 GtkAccessible
-gtk_accessible_connect_widget_destroyed
 gtk_accessible_get_widget
 gtk_accessible_set_widget
 
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 9efbb0cf7a..e6d53bf253 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -50,8 +50,6 @@ enum {
   PROP_WIDGET
 };
 
-static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
-
 G_DEFINE_TYPE_WITH_PRIVATE (GtkAccessible, gtk_accessible, ATK_TYPE_OBJECT)
 
 static void
@@ -141,7 +139,6 @@ gtk_accessible_class_init (GtkAccessibleClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass);
 
-  klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
   klass->widget_set = gtk_accessible_real_widget_set;
   klass->widget_unset = gtk_accessible_real_widget_unset;
 
@@ -220,28 +217,6 @@ gtk_accessible_get_widget (GtkAccessible *accessible)
   return accessible->priv->widget;
 }
 
-/**
- * gtk_accessible_connect_widget_destroyed:
- * @accessible: a #GtkAccessible
- *
- * This function specifies the callback function to be called
- * when the widget corresponding to a GtkAccessible is destroyed.
- *
- * Deprecated: 3.4: Use gtk_accessible_set_widget() and its vfuncs.
- */
-void
-gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
-{
-  GtkAccessibleClass *class;
-
-  g_return_if_fail (GTK_IS_ACCESSIBLE (accessible));
-
-  class = GTK_ACCESSIBLE_GET_CLASS (accessible);
-
-  if (class->connect_widget_destroyed)
-    class->connect_widget_destroyed (accessible);
-}
-
 static void
 gtk_accessible_widget_destroyed (GtkWidget     *widget,
                                  GtkAccessible *accessible)
@@ -249,12 +224,3 @@ gtk_accessible_widget_destroyed (GtkWidget     *widget,
   gtk_accessible_set_widget (accessible, NULL);
 }
 
-static void
-gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
-{
-  GtkAccessiblePrivate *priv = accessible->priv;
-
-  if (priv->widget)
-    g_signal_connect (priv->widget, "destroy",
-                      G_CALLBACK (gtk_accessible_widget_destroyed), accessible);
-}
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 9c2229b3e8..2c29ab3ca9 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -50,8 +50,6 @@ struct _GtkAccessibleClass
 {
   AtkObjectClass parent_class;
 
-  void (*connect_widget_destroyed) (GtkAccessible *accessible);
-
   void (*widget_set)               (GtkAccessible *accessible);
   void (*widget_unset)             (GtkAccessible *accessible);
   /* Padding for future expansion */
@@ -68,9 +66,6 @@ void       gtk_accessible_set_widget               (GtkAccessible *accessible,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_accessible_get_widget               (GtkAccessible *accessible);
 
-GDK_DEPRECATED_IN_3_4_FOR(gtk_accessible_set_widget)
-void       gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible);
-
 G_END_DECLS
 
 #endif /* __GTK_ACCESSIBLE_H__ */
-- 
2.30.2